If the WM_TRANSIENT_FOR property is being deleted, set the owner of the

2004-01-25  Tor Lillqvist  <tml@iki.fi>

	* gdk/win32/gdkproperty-win32.c (gdk_property_delete): If the
	WM_TRANSIENT_FOR property is being deleted, set the owner of the
	window to the root window (i.e., effectively unset it). (#132411)

	* gdk/win32/gdkprivate-win32.h
	* gdk/win32/gdkglobals-win32.c
	* gdk/win32/gdkmain-win32.c: Declare, define and initialize
	_wm_transient_for, a GdkAtom for WM_TRANSIENT_FOR.

	* acconfig.h: Remove HAVE_WINSOCK_H, not used any longer.

diff --git a/ChangeLog b/ChangeLog
index 2d77ec972b8e6ee29005cb7dd600ec9cb70365ed..58fc5c16c346b161e2fbb6fa62787c7ca9f20c19 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2004-01-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkproperty-win32.c (gdk_property_delete): If the
+       WM_TRANSIENT_FOR property is being deleted, set the owner of the
+       window to the root window (i.e., effectively unset it). (#132411)
+
+       * gdk/win32/gdkprivate-win32.h
+       * gdk/win32/gdkglobals-win32.c
+       * gdk/win32/gdkmain-win32.c: Declare, define and initialize
+       _wm_transient_for, a GdkAtom for WM_TRANSIENT_FOR.
+
+       * acconfig.h: Remove HAVE_WINSOCK_H, not used any longer.
+
 Sun Jan 25 15:14:46 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Base the decision
@@ -4625,7 +4638,7 @@ Mon Aug  4 14:53:46 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkscreen-x11.c (gdk_screen_get_n_monitors): 
        (gdk_screen_get_monitor_geometry): Improve wording of the docs, avoid
-       the term "virtual screen".  (#119030, Tor Lillquist)
+       the term "virtual screen".  (#119030, Tor Lillqvist)
 
 2003-08-02  Matthias Clasen  <maclas@gmx.de>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2d77ec972b8e6ee29005cb7dd600ec9cb70365ed..58fc5c16c346b161e2fbb6fa62787c7ca9f20c19 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+2004-01-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkproperty-win32.c (gdk_property_delete): If the
+       WM_TRANSIENT_FOR property is being deleted, set the owner of the
+       window to the root window (i.e., effectively unset it). (#132411)
+
+       * gdk/win32/gdkprivate-win32.h
+       * gdk/win32/gdkglobals-win32.c
+       * gdk/win32/gdkmain-win32.c: Declare, define and initialize
+       _wm_transient_for, a GdkAtom for WM_TRANSIENT_FOR.
+
+       * acconfig.h: Remove HAVE_WINSOCK_H, not used any longer.
+
 Sun Jan 25 15:14:46 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Base the decision
@@ -4625,7 +4638,7 @@ Mon Aug  4 14:53:46 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkscreen-x11.c (gdk_screen_get_n_monitors): 
        (gdk_screen_get_monitor_geometry): Improve wording of the docs, avoid
-       the term "virtual screen".  (#119030, Tor Lillquist)
+       the term "virtual screen".  (#119030, Tor Lillqvist)
 
 2003-08-02  Matthias Clasen  <maclas@gmx.de>
 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 2d77ec972b8e6ee29005cb7dd600ec9cb70365ed..58fc5c16c346b161e2fbb6fa62787c7ca9f20c19 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+2004-01-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkproperty-win32.c (gdk_property_delete): If the
+       WM_TRANSIENT_FOR property is being deleted, set the owner of the
+       window to the root window (i.e., effectively unset it). (#132411)
+
+       * gdk/win32/gdkprivate-win32.h
+       * gdk/win32/gdkglobals-win32.c
+       * gdk/win32/gdkmain-win32.c: Declare, define and initialize
+       _wm_transient_for, a GdkAtom for WM_TRANSIENT_FOR.
+
+       * acconfig.h: Remove HAVE_WINSOCK_H, not used any longer.
+
 Sun Jan 25 15:14:46 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Base the decision
@@ -4625,7 +4638,7 @@ Mon Aug  4 14:53:46 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkscreen-x11.c (gdk_screen_get_n_monitors): 
        (gdk_screen_get_monitor_geometry): Improve wording of the docs, avoid
-       the term "virtual screen".  (#119030, Tor Lillquist)
+       the term "virtual screen".  (#119030, Tor Lillqvist)
 
 2003-08-02  Matthias Clasen  <maclas@gmx.de>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 2d77ec972b8e6ee29005cb7dd600ec9cb70365ed..58fc5c16c346b161e2fbb6fa62787c7ca9f20c19 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+2004-01-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkproperty-win32.c (gdk_property_delete): If the
+       WM_TRANSIENT_FOR property is being deleted, set the owner of the
+       window to the root window (i.e., effectively unset it). (#132411)
+
+       * gdk/win32/gdkprivate-win32.h
+       * gdk/win32/gdkglobals-win32.c
+       * gdk/win32/gdkmain-win32.c: Declare, define and initialize
+       _wm_transient_for, a GdkAtom for WM_TRANSIENT_FOR.
+
+       * acconfig.h: Remove HAVE_WINSOCK_H, not used any longer.
+
 Sun Jan 25 15:14:46 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Base the decision
@@ -4625,7 +4638,7 @@ Mon Aug  4 14:53:46 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkscreen-x11.c (gdk_screen_get_n_monitors): 
        (gdk_screen_get_monitor_geometry): Improve wording of the docs, avoid
-       the term "virtual screen".  (#119030, Tor Lillquist)
+       the term "virtual screen".  (#119030, Tor Lillqvist)
 
 2003-08-02  Matthias Clasen  <maclas@gmx.de>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2d77ec972b8e6ee29005cb7dd600ec9cb70365ed..58fc5c16c346b161e2fbb6fa62787c7ca9f20c19 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+2004-01-25  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkproperty-win32.c (gdk_property_delete): If the
+       WM_TRANSIENT_FOR property is being deleted, set the owner of the
+       window to the root window (i.e., effectively unset it). (#132411)
+
+       * gdk/win32/gdkprivate-win32.h
+       * gdk/win32/gdkglobals-win32.c
+       * gdk/win32/gdkmain-win32.c: Declare, define and initialize
+       _wm_transient_for, a GdkAtom for WM_TRANSIENT_FOR.
+
+       * acconfig.h: Remove HAVE_WINSOCK_H, not used any longer.
+
 Sun Jan 25 15:14:46 2004  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtktoolbar.c (gtk_toolbar_size_allocate): Base the decision
@@ -4625,7 +4638,7 @@ Mon Aug  4 14:53:46 2003  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkscreen-x11.c (gdk_screen_get_n_monitors): 
        (gdk_screen_get_monitor_geometry): Improve wording of the docs, avoid
-       the term "virtual screen".  (#119030, Tor Lillquist)
+       the term "virtual screen".  (#119030, Tor Lillqvist)
 
 2003-08-02  Matthias Clasen  <maclas@gmx.de>
 

diff --git a/acconfig.h b/acconfig.h
index f9617e62b7947e7ad27419ebee193389fb5859ea..f30310c241d034d3be0f3af2cb6ceb0b85af8369 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -34,7 +34,6 @@
 #undef HAVE_SYS_TIME_H
 #undef HAVE_XFREE_XINERAMA
 #undef HAVE_XINERAMA
-#undef HAVE_WINSOCK_H
 #undef HAVE_WINTAB
 #undef HAVE_XCONVERTCASE
 #undef HAVE_XFT

diff --git a/gdk/win32/gdkglobals-win32.c b/gdk/win32/gdkglobals-win32.c
index 651ac883d73b346be1e1f64759eb29621ed588aa..d965370210afdfd147457a237c778b64b69099f2 100644 (file)
--- a/gdk/win32/gdkglobals-win32.c
+++ b/gdk/win32/gdkglobals-win32.c
@@ -59,6 +59,8 @@ GdkAtom                 _gdk_ole2_dnd;
 
 GdkAtom           _gdk_selection_property;
 
+GdkAtom                  _wm_transient_for;
+
 DWORD            _windows_version;
 
 gint             _gdk_input_ignore_wintab = FALSE;

diff --git a/gdk/win32/gdkmain-win32.c b/gdk/win32/gdkmain-win32.c
index 2a2640b77d4ab8d85bdf2997fd96fd465a15794c..c8205500e14c04731a8d54971f0acf1f1cc746eb 100644 (file)
--- a/gdk/win32/gdkmain-win32.c
+++ b/gdk/win32/gdkmain-win32.c
@@ -120,6 +120,8 @@ _gdk_windowing_init (gint    *argc,
 
   _gdk_selection_property = gdk_atom_intern ("GDK_SELECTION", FALSE);
 
+  _wm_transient_for = gdk_atom_intern ("WM_TRANSIENT_FOR", FALSE);
+
   _gdk_win32_selection_init ();
 }
 

diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 807f6355f5d85a07f30bec09da5d8b28c2b324f7..84cf832a04aa972e49579940b634ad4b10b1ea2d 100644 (file)
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -499,6 +499,8 @@ extern GdkAtom               _gdk_ole2_dnd;
 
 extern GdkAtom          _gdk_selection_property;
 
+extern GdkAtom          _wm_transient_for;
+
 extern DWORD            _windows_version;
 #define IS_WIN_NT()      (_windows_version < 0x80000000)
 

diff --git a/gdk/win32/gdkproperty-win32.c b/gdk/win32/gdkproperty-win32.c
index d4ef994653dd7fefb00c292d3fe06ba536acb9f0..d1bee10f83911d46f76b0491143bcf890b66ff25 100644 (file)
--- a/gdk/win32/gdkproperty-win32.c
+++ b/gdk/win32/gdkproperty-win32.c
@@ -265,8 +265,8 @@ gdk_property_change (GdkWindow    *window,
   GDK_NOTE (DND,
            (prop_name = gdk_atom_name (property),
             type_name = gdk_atom_name (type),
-            g_print ("gdk_property_change: %#x %#x (%s) %#x (%s) %s %d*%d bytes %.10s\n",
-                     (guint) GDK_WINDOW_HWND (window),
+            g_print ("gdk_property_change: %p %#x (%s) %#x (%s) %s %d*%d bytes %.10s\n",
+                     GDK_WINDOW_HWND (window),
                      (guint) property, prop_name,
                      (guint) type, type_name,
                      (mode == GDK_PROP_MODE_REPLACE ? "REPLACE" :
@@ -470,15 +470,22 @@ gdk_property_delete (GdkWindow *window,
 
   GDK_NOTE (DND,
            (prop_name = gdk_atom_name (property),
-            g_print ("gdk_property_delete: %#x %#x (%s)\n",
-                     (window ? (guint) GDK_WINDOW_HWND (window) : 0),
+            g_print ("gdk_property_delete: %p %#x (%s)\n",
+                     GDK_WINDOW_HWND (window),
                      (guint) property, prop_name),
             g_free (prop_name)));
 
   if (property == _gdk_selection_property)
     _gdk_selection_property_delete (window);
+  else if (property == _wm_transient_for)
+    gdk_window_set_transient_for (window, _gdk_parent_root);
   else
-    g_warning ("gdk_property_delete: General case not implemented");
+    {
+      prop_name = gdk_atom_name (property);
+      g_warning ("gdk_property_delete: General case (%s) not implemented",
+                prop_name);
+      g_free (prop_name);
+    }
 }
 
 gboolean